Merge change I92d49bcd into eclair

* changes:
  [Issue 2163519] Making ContactsProvider2 honor the super-primary flag on a photo