This reverts commit 28dc8de660. Reason for revert: the code change introduces significant delay when saving deep shortcut icons in cache. Change-Id: I5d67ac0c4c867a40e882b7a46be446f8f7f63ac7
28dc8de660