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

...32