Merge "Sensor Batching Bug fixes." into klp-dev