MDL-59750 core_calendar: better handling of event subscription