Merge changes Ie18bce98,I1c600bc2

* changes:
  Add keylayout for Xbox One USB controller
  Keylayout for xbox controllers