Merge "Active container should contain non-finishing activity" into sc-v2-dev