Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev