Merge "Consider destruction of activity for task removal" into sc-v2-dev