Merge "Fix some cases when enabling hierarchical animation"