Merge "Fix starting window leak when adding/removing quickly" into oc-dev