Merge "Don't query for the bubble shortcut if it's already on the NotifRecord" into rvc-dev