Merge "Keep contact affinities separate across users." into lmp-dev