am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev

* commit '0ac0b733d510fc17d072c61055c0e2ad446689ff':
  Fix incorrect key translation in Settings refactor