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

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

Change-Id: Ie6524420d2c9e007f45fdc31fea5c458b2b862b4