registry: cleanup and rename Registry -> Session Upstream-commit: 49c43004a73e2e23e895c3340451342ffe496bba Component: engine