Merge "Update attrs.xml and public.xml to allow a recognition service to be selected as default" into sc-dev