Merge "Enable HID Device Profile Service (2/2)"