Merge "Merge "Treat SENSOR_DIRTY as user not detected" into qt-r1-dev am: a4a02a78 am: 65574272 am: bc5132b4"