Merge "TvContract: Add a field for network affiliation to the Channels table"