Merge "Include tvinput type, id and hdmi port in TIF metrics"