Merge "Centralized user icon drawing with badges" into nyc-dev