Merge "Fix race conditions between config-manager and persister."