Merge "Switch eventTimezone2 to eventEndTimezone to fix crash bug"