Merge 5.2-rc3 into usb-next