Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev