Merge "Add keylayout for Xbox One USB controller" into qt-dev
am: 77c1c938a5

Change-Id: I783281baeac2d10437826b2b21c5c086835ec677