Merge \"Removing shadow and badging from the icon which is shown in the menu These are added as soon as the icon is added to the workspace\" into ub-launcher3-calgary
am: 984c260a98

Change-Id: I3c8a8ee4aef9a1eeeb0155af27495b80529ced3b