Merge "Addressing API feedback for ContextualSearchService" into main