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

Change-Id: I5613daa2c78ed625e4a067abd86b905e924c7e6a