Merge "Use just the preview for drag and drop in the standalone activity" into main