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

* commit 'f7104136927f45e152cec3583463b8ef1570df7b':
  Stop marking gamepads as keyboards