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

Change-Id: I3ca3d3aa078e518471fe38f741e7618ca972a3ae