Merge "HDMI: Do not start NewDeviceAction while DeviceDiscoveryAction is running" into main