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

Change-Id: I5a7e9e54d9efbc72ac30ecd5e68fb31deae7d058