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

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

Change-Id: Ice3e7f7ebe50f85eb0a9f3e04662df5f68963c07