Revert "Revert "Revert "cache shourtcut image"""
am: 52908c9adc

Change-Id: I597a9e3a314887b668f482e74a4d2f548cca1da9