Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev