Merge "Make ProgressAnimator non-static." into main