Merge "Improve ContactPhotoView"
am: 284a54619d

Change-Id: Ifb9960debcb41caad429b069f45bc273bb553534