Merge "Expand the launching container if necessary" into main