Merge "Hide the setting from the search when feature is disabled." into main