Merge "Finish existing secondary containers when starting to side" into sc-v2-dev