Merge "Revert "init.usb.rc: set sys.usb.config to none before changing it""