Merge "Revert "Fix data reporting state when using HID device""