Merge "Shorten the strings in time zone picker menu" into pi-dev