Merge "Don't store SettingsCache within ContextualSearchStateManager." into main