Merge "hwc: cwb: Fix typo causing incorrect variable usage"