Merge "Fixing animation bug when moving an icon to an adjacent screen"