Merge "Ensure activity added to existing task if not resetting the task"