am 7e0fad1d: am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev * commit '7e0fad1d': Revert "Stop marking gamepads as keyboards"