Merge "Fix possible NPE in ContactPhotoManager." into ics-mr0