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

* commit '75f329aa6a51a80540d178e39db162b54512634d':