Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7' * commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7': Don't restore any setting that we don't think should be backed up
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7' * commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7': Don't restore any setting that we don't think should be backed up