Merge "HDMI: Support Feature Discovery feature" into main