Merge "Don't reset sys.usb.configfs during userspace reboot"