am 4a47775a: Fix broken aggregation behavior for pinned contacts and tests

* commit '4a47775ab4008165328ddab97f5151ddd94d9ab8':
  Fix broken aggregation behavior for pinned contacts and tests