I saw a couple of days ago that the card designers have figured out a fix. There will be a revised card design in the future where the RFID chip is inactive until you put your finger or thumb on a contact point. So it would still work when you want, but you'd have to take an additional step to use it. No mention of how long it'll take for such cards to get to your wallet, but I'd guess it's going to be over a year.
I'm not sure if RFID chips have hit passports yet, but the gov't wants them to have RFID and this redesign would also be important there. When traveling overseas, you really don't want to have bad guys scanning for U.S. passports.