Bug 982568 - Re-enable keyboard OOP
Merge pull request #17268 from RudyLu/keyboard/Bug982568-re-enable_keyboard_OOP

Bug 982568 - Re-enable keyboard OOP.
r=timdream.