Merge "Revert the time zone display name logic" into oc-dev