Merge "Fix flake in BackProgressAnimatorTest" into main