Merge "Restrict WifiScanModeActivity when user restriction applies" into main