Merge "ConnectivityService: safer locking" into oc-dev