Merge "hwc: Add additional trace points"