Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev