Merge change 25853 into eclair

* changes:
  Don't back up / restore certain sync-related settings