Merge "Use the descriptor passed in when adding USB device instead of querying again." into main