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

Change-Id: Ie32a5d1c5f1308060af6ae8c3b7d4c25ebdc9301