Merge remote-tracking branch 'usb-gadget/next'