Merge "Check the DeviceId for generating DragEvent" into main