am ffc84355: Merge "Revert "Reorganize Keyboard settings screen""

* commit 'ffc843550c4d1ed96d26febd4be6239f0ecb487c':
  Revert "Reorganize Keyboard settings screen"