Prefer profile photo over system contact photo.

app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -607,8 +607,8 @@ public class Recipient {
   public @Nullable ContactPhoto getContactPhoto() {
     if      (localNumber)                                    return null;
     else if (isGroupInternal() && groupAvatarId.isPresent()) return new GroupRecordContactPhoto(groupId, groupAvatarId.get());
-    else if (systemContactPhoto != null)                     return new SystemContactPhoto(id, systemContactPhoto, 0);
     else if (profileAvatar != null)                          return new ProfileContactPhoto(this, profileAvatar);
+    else if (systemContactPhoto != null)                     return new SystemContactPhoto(id, systemContactPhoto, 0);
     else                                                     return null;
   }