Merge "Floating version of VerticalExpandContainerSpec" into main