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

Change-Id: I4e3f088897dd557e92191bccb5b46288ecf40806