Merge "Add keylayout for Xbox One USB controller" into qt-dev