Merge "hwc2: Add more tracing"