Bug 840495 - [keyboard] Fix & restore unit tests
Merge pull request #9046 from davidflanagan/bug840495

Bug 840495 - [keyboard] Fix & restore unit tests r=djf