I just sent in my renewal last week. I was sent a notification that I was expiring yadayada, DO NOT ENCLOSE FEE in bold print.
Basically, both apply. No fee if you've had a PAL before is what it boils down to.
Also, just a guess, but the fee waiver will probably be extended past May, just like the amnesty keeps getting extended.