Merge "Removing shadow and badging from the icon which is shown in the menu...

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