Merge "Revert "Update the leash position when gaining a new control"" into main