timob-15877: Fix keyboard regressions
Merge pull request #5068 from hieupham007/timob-15877-3_2_X

timob-15877: Fix keyboard regressions