Merge "Fix heap trimming logic."