am 4e183215: am 1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread

Merge commit '4e183215bac239bbc039df361fed034a965030ec'

* commit '4e183215bac239bbc039df361fed034a965030ec':
  Don't write settings multiple times when unmounting.