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

Change-Id: Ifd9099232b660a0bf6c35141ab0cfef20dd28b47