When a contact has an avatar attached to their profile, show it on the screen and in the AOD. The lock screen pop-up works fine. Make the others match.