Merge "Keylayout for xbox controllers" into qt-dev