Merge "Fix animation for non-default grids when dragging icon from All Apps into a Folder" into ub-launcher3-rvc-dev am: 400dfe0d93

Change-Id: Iaaab8fa1d4d0273aef005e3c02186ef0599d12fe