Merge "Include AvatarInfo as part of AccountInfo"