Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev