Merge "Uses PeopleStoryIconFactory in config activity" into sc-dev