Merge "hdr10+: adding C2 params for HDR10+"