Merge branch '372655-join-timezone-city-names' into 'master'

Fix display of selected timezone for cities with duplicated identifiers

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141522



Merged-by: Deepika Guliani <dguliani@gitlab.com>
Approved-by: Tomas Vik <tvik@gitlab.com>
Approved-by: Jon Jenkins <jjenkins@gitlab.com>
Approved-by: Gosia Ksionek <mksionek@gitlab.com>
Approved-by: Deepika Guliani <dguliani@gitlab.com>
Reviewed-by: Gosia Ksionek <mksionek@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>