Merge change 23376 into eclair

* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync