Merge #8930: Move orphan processing to ActivateBestChain