[Finish #42138287] Always include personal events in "upcoming events"