Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev