Persist settings on a dedicated background thread am: 82b8c92b97
am: b3f1e67921

* commit 'b3f1e679211f5a0d5c5144006de4e8efd14f8e85':
  Persist settings on a dedicated background thread

Change-Id: I8524d45e06fb47d39821eba481ff3703d262597f