Merge "Refactor AnimatorSet in prep for adding more functionalities"