Merge "Fix cancellation of AnimatorSet when child animation has delay"