Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev