Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev