am 4032a773: Fix incorrect key translation in Settings refactor

* commit '4032a773c4605894a2b6137590c7124ea16b7ab2':
  Fix incorrect key translation in Settings refactor