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

* commit '034769fcbcffa097e5145d9697a84ada95734c59':
  Reorganize settings in Google Keyboard