Merge "Show topology pane in per-display fragment" into main