Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev