Merge "hwc2: Fix code scan issue" into display.lnx.6.0