Merge "Add missing consumer HID usages" into main