Merge "display: update SetColorModeWithRenderIntent for virtual display"