Merge "Capitalize TZ display name strings"