Merge "Add null check when settling on LAST_TASK" into sc-v2-dev