Merge "hwc: Fix unchecked return value"