Merge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev