Merge change 25212 into eclair

* changes:
  revert to black video background, since we don't need the color-key anylonger