Merge "Improving getWorkspaceAppIcon()" into ub-launcher3-qt-qpr1-dev
am: bfff1c80df

Change-Id: I1fb1774ba85d3ef51abb29347ca8621f1f95d8b2