Merge "cache/uncache ShortcutInfo associated with the bubbles" into rvc-dev