Merge "Fix the animation disappeared issue"