Merge "Keylayout for xbox pdp controller" into qt-dev