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

Change-Id: I22cd269ff2c75f400f238b82bee32aeb5407bf14