CAL-200 [Activity type] fix bugs activityId not matched between event and activity