Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread