Merge "Fix BackProgressAnimatorTest flake" into main