Port of use-avatars-in-activity-view to EE

Merged Annabel Gray requested to merge ee-use-avatars-in-activity-view into master