Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938 am: d88c4067" into qt-r1-dev-plus-aosp