Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev
automerge: f6df7bf

* commit 'f6df7bff53d325e11233bc08fbf5a3f212723b79':
  TIF: Define more cannonical genres in TvContract