Merge "Snap to the closest edge when velocity is 0" into main