Merge "Display avatar and a link to change the avatar in the profile screen"