Merge "hwc: mdpcomp: Restructure for 4kx2k displays"