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

Change-Id: I74b279c6e4b26429c3868fac3e9ca9e0327af202