Merge "USB: Fix handling USB accessory attached when device is booting"