Bugfix/1068093v2

Doug, I'm addressing the two points you made above:
1) So, when the wallpaper is changed, the wallpaper is shown for a contact with no picture.  If the contact has a picture, that is shown.
2) I tried removing the image parameter/branch and then we get a blackscreen on the incoming call when they don't have a picture.  I believe we need to keep that image "if" there.  I do think it's a bit confusing though.  We are trying to handle two things in one function that maybe shouldn't be.  Maybe we should separate out the wallpaper setting case from the setContactImage case.