Merge "Allow system settings to update TvInputInfo"