Merge "Skip reorder animation while collapsing" into sc-dev