Merge "SearchFeatureProvider's context field is removed"