Merge "Finish the primary container while secondary exited" into sc-v2-dev