added calendar_reset placeholder
Merge remote-tracking branch 'origin/schedule-activity-dialog' into schedule-activity-dialog