PR #9640 review: keep live token on double refresh