Merge "Improve ContactPhotoView"