Merge "Give CompanionDeviceServiceConnector its own worker thread"