SOC-4376 | Wrong avatar displayed in comments on user activity stream