@mcc why don't you switch to a non-google 2FA app, there is some choice of these; I'm using andOTP (or even a terminal or desktop program - this takes the phone out of the picture; I am using a terminal program called pass, with a pass-otp extension) ?