Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev