Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev