Merge "Fix the wiggle reorder aniamtion stopping if dragging" into tm-qpr-dev