Merge change I49c9a3a3 into eclair

* changes:
  Fix bug 2325244	screen turns black for a brief period of time