Merge "Fix flaky tests in ExpandedAnimationControllerTest" into main