Merge "Change GC ergonomics to better handle heap verification."