[master 1/2] Allow the columns of the container combo box to flow (#1170275)