Merge "DO NOT MERGE Set the sensor threshold only if sensor exists" into qt-qpr1-dev