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

* commit 'b41d1fcd98dc30545919fb5401f68fa909682aae':
  Reorganize settings in Google Keyboard