Merge "Fix window leak when split-screen is released"