Merge "Cleanup unused code in DividerSnapAlgorithm" into main