Finally speaking to someone. I've got two phones to upgrade. They are indeed waiving the fee for both so definitely worth calling back.
As someone else mentioned, you can get the Xbox extra...just ask them to put you on the Android full works plan and then you get access to the other extras.
The agent definitely confirmed for me that Upgrade Anytime is completely gone, but assured me there would probably be some kind of promotion next year anyway, so we'll see how that goes.
