Merge "Remove unused ConnectivityManager object" into main