Merge "diag: Add usb events to a queue"