Merge change 25188 into eclair

* changes:
  make the window-shade use an opaque surface if possible