Merge "Show built-in display if topology is visible" into main