Merge "Defer ensuring visibility on enter/exit split-screen" into pi-dev