Rename 'time' to 'activity_time' for consistency. #3054.
Add test for 'with' and 'without' time for scheduled activity. #3054.
Merge branch 'master' of github.com:NUBIC/ncs_navigator_core