Add back CatalogManagerV2#update_handle_in_cc