Merge "Include cache-only and pinned-only shortcuts as Sharing shortcuts as well" into rvc-dev