Merge "TIF: Replace TvInputInfo in SessionState with ID and component name"