Merge "Don't remove starting window for visible app." into oc-dr1-dev