Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev