Merge "Keylayout for xbox controllers" into qt-dev am: 287b20ae0e
am: 0ebe5b44e1

Change-Id: If2b206b31d8470db4c787ca7e7349c485a95622b