Merge "Remove plain_contact_photo, as QuickContactBadge can take over now"