Merge "hdr10+: adding OMX config index and profiles"