Merge "TIF: Add new TvContract fields for guide view on launcher"