Merge "Handle adding EmbeddedWindows to host windows without an activity"