Merge "Treat SENSOR_DIRTY as user not detected" into qt-r1-dev