Merge "Track added/removed window when focus is null" into oc-dev