am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev

* commit '8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b':
  Revert "Stop marking gamepads as keyboards"