Merge "Add Display-P3 color mode"