Merge "Access ServiceConnector.mService in a thread-safe manner"