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

Change-Id: Ia0aceba1cf5ef23361d497974a6b79b419a8bb36