Merge "Fix a race in settings update." into nyc-dev