Merge "Fix muti-user issue for CompanionDeviceManagerTest" into sc-dev