Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev