[Finishes #76012058] Handle edge collisions with pixelless moves