CAL-957 [Performance] Improve first time show up calendar event