Simplify the runtime Register reconnect logic Upstream-commit: 234f5ac39f22b02cce62d789283a4ed80b728fe2 Component: engine