[Bug 2336875] New: Layout switching in CLI