Merge "Improve heap verification for invalid roots."