SOC-3472 | Add activityId to all of Activity Task