Merge 5.12-rc6 into usb-next