Merge "ConnectivityService: safer locking"