Merge "TvContract: Enable building programs URI also with channel ID"