Merge "Ensure non null references for animateReorder() method." into main