Merge "[SurfaceFlinger] Decouple color management from wide color display property."