Merge "hwc: Fix null dereference"