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

* commit 'b3f1e679211f5a0d5c5144006de4e8efd14f8e85':

Change-Id: I0f53d61dda0cf673f932a7657cdf8a84c6d68cc0