Merge "Remove host activity association when removing EmbeddedWindow" into udc-qpr-dev