[stable21] Keep pw based auth tokens valid when pw-less login happens#29130

PVince81 merged 2 commits intostable21nextcloud/server:stable21from

backport/27886/stable21nextcloud/server:backport/27886/stable21Copy head branch name to clipboard