Merge "HDMI: Avoid creating multiple DeviceDiscoveryActions for a local device" into main