Merge "TIF: Add extras to TvInputInfo"