Merge change I813fdb7a into eclair

* changes:
  Fixes for proximity sensor behavior: