Merge "Use AnimatorTestRule to end animators during tests" into main