Merge "HID Device role API fixes"