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

Change-Id: Ifb116b223e6ffd5b9224fc4bdb5593fe215bdaae