Merge "Fix odd avatar when message sender is a number" into pi-dev