Merge "Fix deadlock of mObject and mDevices in RemoteDevices"