Merge "Fix unexpected closure of the bubble." into rvc-dev