Merge change I21799450

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