Merge "Separate code paths to launch split from existing pair vs new pair" into udc-dev