Merge "Close assistant activities on closeSystemDialogs" into rvc-dev