Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev