timob-15877: Fix keyboard regressions

testing steps in JIRA.