Merge "Don't prune read only contacts in SaveService for joins and splits" into nyc-dev