Merge "Add UserManager.getUserIcon()" into jb-mr1-dev