Merge "Preemptively reset split reparenting flag when entering split" into udc-qpr-dev