[stable31] fix: refactor request token handling and do not update with invalid result

[stable31] fix: refactor request token handling and do not update with invalid result #19011