Merge "Revert "Persists bubbles to disk (part 4)"" into rvc-dev