Merge "SensorService handles last known state properly" into gingerbread