Merge changes I6f6b4d78,I874696cf into rvc-dev

* changes:
  Only send reset state annotation when needed
  Group annotations for the same atom id