Merge "Fix ConnectivityManager memory leak"