Bug 1078247 - [v2.2] Fix keyboard object app after updates from Bug 996332
Merge pull request #24879 from chirarobert/fix_keyboard

Bug 1078247 - [v2.2] Fix keyboard object app after updates from Bug 9963...