c1786f1697
Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e' * commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e': Fixes for proximity sensor behavior: