Merge "Add USB information to bugreport" into main