7461: move ImageContentManager, TextContentManager