Fix race condition in registry/session Upstream-commit: 488c355d9499fd1b8b24d8ec3a8004475c095ffa Component: engine