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

Change-Id: Ie69b4735c8a22cd590f9c578d67f66bc49e603bf