Yes, this is exactly what they're going to do. They've already said they'll update the firmware before the deadline to remove the scrolling behavior, so their phones won't get taken out of the stores.

[1] Dutch: http://tweakers.net/nieuws/76361/samsung-blijft-galaxy-s-ii-...

[2] Translation: http://translate.google.com/translate?js=n&prev=_t&h...