[stable22] Keep pw based auth tokens valid when pw-less login happens#29129

MichaIng merged 2 commits intostable22nextcloud/server:stable22from

backport/27886/stable22nextcloud/server:backport/27886/stable22Copy head branch name to clipboard