Merge "session: Fix missing return in SessionBackend::resetId()"