Merge "diag: Defer usb connect/disconnect processing"