Merge "Fixing animation end not-called when cancelling state the animation recursively" into sc-dev