Merge "improve hwc log output"