Merge "Fix HdrCapabilities flattening" into oc-mr1-dev