Merge "Don't hold a lock while reading shared preferences from disk." into nyc-dev