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

Change-Id: I087ed38bdad56f6b6549fd3ab8a08bb66be22a7b