Merge "[sf] Fix wakeup related to CE#needsAnotherUpdate" into main