Merge "Use the same transaction to set position of the leash" into udc-dev