Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev