am d07f7c53: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev

* commit 'd07f7c5377672422ebc5679d884fa6870b12f605':
  Reorganize settings in Google Keyboard