Merge change I84612ea6 into eclair

* changes:
  Add a delay to wifi driver stop on screen off.