Merge "Ensure new events have a calendar_id"