Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev