Merge "Update Dolby surround sound display names"