Merge "Fix issues with bubbles crashing/removing during expansion." into rvc-dev