Merge "TvInputHardware: Add HDMI port ID"