Merge "SessionManager: Don't generate user tokens when checking the tokens"