Merge "Reduce race when connecting to an existing content provider." into nyc-dev