Merge "Fix events/<key> folders not being deleted during onDestory." into rvc-dev