(Android) Input tweaks/cleanups