Merge "Reorganize settings in Google Keyboard" into lmp-dev