Merge pull request #1219 from dorkster/android

Various input-related fixes