INTEG-352 | Wrong avatar displayed in comments on user activity stream