Merge "Add more columns to TV metadata to enable newly requested use cases"