Merge "Add hdmi_config_prop for hdmi properties"