Merge "HDMI: Feature Discovery feature patch" into main