Added backported patch with usb hang workaround