Merge "Restrict WifiDialogActivity" into main