Merge "RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing" into qt-qpr1-dev