Synchronize when acking settings.

Without this tests fail.
Merge pull request #464 from square/jwilson_0119_fix_race

Synchronize when acking settings.