Merged with upstream/master and created ScheduleActivity that now works
properly.