More CoreGraphics tracing

Change-Id: I2fbdb95637ee77b444e1947405d64cdd2e0338af