Merge "CCodec: make HDR10/+ support detection logic work for encoders"