Merge "Fix alternate time zone display for clock widget." into jb-mr2-dev