Pull in changes made to ColumnLayout