Merge "Preventing DragAndDrop for PS apps." into main