Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread