Merge "Use new color avatar assets" into jb-mr1-dev