Revert "Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP""

This reverts commit 90fbd75eccd3408ca04907fd80b72275771b3b30.