Merge "Fix a race condition in sensormanager" into gingerbread