Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev