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

Change-Id: I68b75254aec4f9b69b69b49209686a1682373c66