Merge "HWC: Minor fix in 4k2kYUVsplit feature"