Merge "Fix window leak when split-screen is released" am: 862cfec1c3 am: c91cf52659
am: e3a60f2065

Change-Id: Idacf2f4a2a9afea26607a2f5660ba89aeffb4174