XCOMMONS-466: Dispose the EmbeddableComponentManager in two steps
(cherry picked from commit 181e6391980837b134697b266a8d895315f7528e)