Merge "UsbDescriptor: Add finite timeout to control transfer"