Merge change Ic42763b1 into eclair

* changes:
  Fix issue #2242440: Window screen brightness attribute is broken