Revert "Revert "cache shourtcut image""

This reverts commit f3d58f1f84192a0446ba3bf2fcfd773ad538bdde.

Reason for revert: Rolling forward for development and fixes.

Bug: 140242324
Change-Id: I954cface2e50a5a9a5e143d2ea29fbcebb298ede
6 files changed