Merge "Pass component name into SuggestionFeatureProvider"