Merge "Check proximity detector before powering off." into jb-mr1-dev