Account bug review fixes (backport #62471)

Merging a group into one of its grandchildren no longer breaks the account tree, along with other fixes from the review.