Merge "Show the proper time zone name based on whether event start time is in DLS or not" into jb-dev