Merge "Move logic only used on the reorder from the cellLayout to ReorderAlgorithm" into main