am 4c82d3b7: Handle external sources that request both social and detail.

Merge commit '4c82d3b7323b498e2a21daf94505daf0cd32d212' into eclair-mr2

* commit '4c82d3b7323b498e2a21daf94505daf0cd32d212':
  Handle external sources that request both social and detail.