I just learned that Nokia is working on software fix to improve this...
Not sure if it will be ready for first Diablo release, but it shouldn't be too much of a problem since with SSU the update should be easy. (No reflashing...)