Merge "Revert "Persist settings on a dedicated background thread"" into nyc-dev am: 875e99443f
am: e3dec83852

* commit 'e3dec8385278472435d7e29249ce703e1a2250c4':
  Revert "Persist settings on a dedicated background thread"

Change-Id: I23aec19f10f9953505626f4d19c19de649695a65