Merge "Allows pinned-only shortcuts to get cached" into rvc-dev