Merge "Improve dumping of display list memory usage"