DS-3197 by ronaldtebrake: fix activities being send immediatly, so the notifications do not get purged