Merge "Keep sensor events for default flush operation" into oc-dev