Merge "Fix race in ScopedUnfoldTransitionProgressProvider" into main