XCOMMONS-466: Dispose the EmbeddableComponentManager in two steps