Issue #2172403 by adrip: Old display content is not unset correctly in some cases (IPE, editing multiple panes, etc)