Merge "Refine the sync in CachedBluetoothDevice"