Merge "driver: usb:Increase timeout for XHCI events by 1000ms"