Merge "Make MainThreadUnfoldTransitionProgressProvider callback registration thread safe" into main