@Hadar
Are you sure this is a real problem?
I thought TurboTax has not added support for Form 8915-F yet .
------brute force:
remove NY state return
e-file federal (you can't do this if Form 8915-F is not supported yet).
override 1040 5b to subtract 2020 distribution.
redo NY state return.
If unable to e-File state of NY you'll have to file NY return on paper.
