Merge "Fix a race condition with respect to clients of SyncStorageEngine." into jb-dev