Merge "Ensure SyncManager doesn't schedule an EJ with a delay." into sc-dev