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

Change-Id: I1ec0f294c0daa7a1e3e4d9580e371b7badbc80cf