Merge "Revert^2 "Call setOverviewDragState() whenever taskbar is recreated"" into main