Merge "Adding TV-specific strings"