Merge "Delay pruning direct share targets." into pi-dev