Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev