(Android) Input - cleanups