Merge "WifiScanner: Disallow scans when location is off"