Merge "Revert "Migrate Animation Tests to CTSv2""