Merge "Fix: ConnectivityManager is initialized with a wrong context"