Merge "TIF: Refactor TvInputInfo"