Merge "Unbreak display list debug dumping"