Merge change 7480

* changes:
  Make sync not start until setup wizard is done.