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

Change-Id: I371496829aa5049659b01ee8bf8bcff6ed6d31af