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

Change-Id: If16c860cc595cbc155f616acf0006d2e863df8b7