Merge pull request #4048 from koying/fixdroidkbd