Merge "Fix prox and wake sensor conflict"