Merge "hwc2: Store output buffer handle correctly"