Merge "Add missing type for USB headset devices"