Merge "Revert "Persist settings on a dedicated background thread"" into nyc-dev