Merge 3.12-rc4 into usb-next