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

Change-Id: I7e41a1bf754fd033d42f3ba021b83c2fe42e895d