Merge "Allow SetupWizard to do WiFi scans if location off"