Merge "Revert "cache shourtcut image"" into ub-launcher3-qt-future-dev
am: 3463d1c5f9

Change-Id: Ic71994e9567e023666fb435c989c19362b41861f