Merge "Add a new enum to support available/non-searchable settings"