am b8933665: Merge change I3f0ded49 into eclair

Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.