Merge "Don't write settings multiple times when unmounting." into gingerbread