Merge "Prediction icons in Taskbar were updating when dragging icon in the same place"