Merge "Fix incorrect key translation in Settings refactor" into lmp-dev