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

Change-Id: Ife6c4a83dc0bf8e183360306208737b42b3cd08b