Merge "hwc: Fix black line in center of 4k2k."