Merge "Fix bubbles returning after a runtime restart" into rvc-dev