Merge "Add default display config for television"