Merge "Ignore request to add starting window if already visible" into oc-dev