Bug 942790 - Re-enable keyboard oop
Merge pull request #14037 from timdream/keyboard-oop-reenable

Bug 942790 - Re-enable keyboard oop on master, r=rudyl