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

* commit 'da38d0d3978da1c141effc1562dfbb2d50893555':