More CoreGraphics tracing

Change-Id: Idfb615063ec8822dee468883c844bab7dba7cf4c