Merge "Trace drawing state"