Merge "Removed vibrations when icons go into / out of the shelf"