Merge changes from topic "cache-shortcut-image" into ub-launcher3-qt-future-dev
am: 570d9a1e9c

Change-Id: I3182c90a69d1c93daf8d33cfe7f15f613ac972fd