Make inline text input work properly on Android. (take 2).

This reverts commit 06691f77a67a26989c6fd2f29cb6203f9133ca88.  Sorry for the mess. @bcjordan , please take a look, no rush