Merge "[Wi-Fi] Apply WifiDialog2 in WifiSetings2"