Merge "Add keylayout for original xbox controller" into qt-dev am: aaaee164de am: 0a7a87b548 am: ec53916597
am: 18e089ebac

Change-Id: I4f3522a393397da4093620a685d8424b15579c81