Merge "Reset cascading position to center if snapped to left/right" into main