Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev