Merge "Merge "Treat SENSOR_DIRTY as user not detected" into qt-r1-dev am: a4a02a7854 am: 6557427258 am: bc5132b4f6"