Merge "Properly clear animations after dragging" into sc-dev