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

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