Merge "Making sure the reorder animation goes back to the initial position." into main