Merge "Fix DreamService not finishing correctly" into rvc-dev