Merge "More refactor on ValueAnimator"