Merge "UsbDeviceManager: Reset sys.usb.config if it is "none" at boot"