am dec12adb: Merge "Changing hotseat keyboard controls" into ub-now-porkchop

* commit 'dec12adb6dba114ad2feedce3a9f3ce0c178fc04':
  Changing hotseat keyboard controls