Merge "Always remove orphaned starting windows, no matter what the state" into oc-dev