Merge "hwc: NULL check on buffer handle"