Merge change I1bc566a1 into eclair

* changes:
  Ignore the light sensor if the screen is turning off.