Merge "Fix dump of the persistent drawing cache attribute."