Merge "Handle content URI permissions on drop"