Merge pull request #4875 from koying/fixdroidremotekeyboard