Revert "Revert "Merge pull request #14037 from timdream/keyboard-oop-reenable""

This reverts commit 03e6e87c7e1b740e2968bbab675600ead2cca84a.