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

Change-Id: I0cd5b402d00c6b201d2ba598606d292d83c52e4d