Merge "Return asset manager with correct config from ContextThemeWrapper"