Merge "Fix race between SensorManager ctor and callback" into qt-dev am: 4f398669a4
am: d55cdc8907

Change-Id: I2c3a338cd8419b3e7c89939f89bd6b6acec52b2a