Coalesce all handle_new_root logic into one function

Coalesce all handle_new_root logic into one function #18196