Merge "Load the avatar icon if it's not yet in the activity view" into jb-mr2-dev