Revert "Merge pull request #13946 from timdream/keyboard-pref-off-v1.2"

This reverts commit 7bd5adfa1f201dc7b9cfbc8e555faef0b75b944c, reversing
changes made to 7b24f1d1f167fc40b1e887f4ff3746d383af3c2f.