Merge "Refine animation to remove strange reshuffling animation"