Merge 6.8-rc5 into usb-next