Merge "Cache the shortcut when the associated notifications are posted and uncache when they are gone" into rvc-dev