Merge changes from topic "sdr_hdr_displayconfig"

* changes:
  display: support display config items for sdr and hdr blending
  displayconfig: support sdr and hdr blending