am ee2b094d: Do not deactivate the proximity sensor until after the sensor returns negative.

Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-mr2

* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
  Do not deactivate the proximity sensor until after the sensor returns negative.