Merge pull request #1287 from dorkster/fixes

Fix Android touch input