Merge "Allows pinned-only shortcuts to get cached" into rvc-dev am: 6184b48e6e am: 08051835a6

Change-Id: Ife84a1f607c081e9cb6a967e2738011d4ccfcb5d