Merge "Do not set URL span if span start/end are invalid" into tm-dev