Merge "hwc2: Cache color mode and render intent for Primary display"