Merge " the HID device state is out of sync after upair."