Merge "Make pinning files async in a background thread" into nyc-mr1-dev