Merge "Assume sensors perform prox check" into qt-qpr1-dev