Merge "hwc: Add scalar tag to dynamic debug"