Merge change Ibe1d06fc into eclair

* changes:
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.