Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev