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