Merge "core: add hdr capabilities to display" into nyc-dev