Merge "Update the leash position when gaining a new control" into 24D1-dev