Merge "fix calendar crash when deleting events in agenda view"