Merge "Fix starting window leak when adding/removing quickly" into oc-dev am: 3047a5ea7a
am: fc7ecb368a

Change-Id: I05daa5e25e944214a5844b9c011a60926535ed6a