Merge "Rip out WindowContainer#isScreenOverlay"