Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev