Merge "usb-detector: Add BusNum property to UsbDevices interface" into main