Merge commit '9122a49cd68ab2a472516c568298699f376bf80a' * commit '9122a49cd68ab2a472516c568298699f376bf80a': Don't back up / restore certain sync-related settings
Merge commit '9122a49cd68ab2a472516c568298699f376bf80a' * commit '9122a49cd68ab2a472516c568298699f376bf80a': Don't back up / restore certain sync-related settings