Merge "Null-check the dragged-out bubble." into rvc-dev