Merge "Do not create indicator before startDragToDesktop." into main