As an addendum to my first reply to you below, I have also noticed that when I attempt to upload my Fidelity 1099-R to Turbo Tax, that Fidelity is now saying to wait until January 30, 2021 before uploading, which is another way of saying that I think they're going to issue corrected 1099Rs for those this situation applies to. Hopefully, I'm right.
