Merge "Make no-history activity be finished with different tasks" into sc-dev