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

* commit 'b7925f2219480d4ddbb1c655b9b386ed031815a3':
  Revert "Stop marking gamepads as keyboards"