Merge "Revert "Keep selection of widget at the end of widget dragging"" into main