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

* commit '8de4d5eccacfb220442226b886a4b649a9f1063d':

Change-Id: I44456241f432bfd334f5cab2a6cc2273ee3429f6