Merge "hwc: Fix typo" into display.lnx.5.0