S59194: update container and column to utilize the state preference persistence and size according to available space