Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev