Merge "Deactivate sensors after flush events are received" into qt-dev am: 8913d1df2c
am: 80a247e090

Change-Id: I0499bbc738bb4a5da48ee8b784bdeb204ae4c884