Merge "Add user settings and intent filters to userTypeDetails" into sc-dev