Merge change I3f0ded49 into eclair

* changes:
  Increase light sensor delay from one to two seconds.