Merge "Fix some proximity sensor bugs." into jb-mr1-dev