Merge "Use ValueAnimator instead of property setter" into main