Merge "Fix inverted condition of hierarchical animation"