Merge "Remove additional sf transaction when constructing a leash" into rvc-dev