Merge "Deactivate sensors after flush events are received" into qt-dev