Merge "Use the real behavior to decide the animation" into sc-dev