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

Change-Id: Ibb1d670437224f967d6b3d8d5e7d49dda87d0e52