timob-15877: Fix keyboard regressions
Merge pull request #5059 from hieupham007/timob-15877

timob-15877: Fix keyboard regressions