Merge "Fix drag and drop URI permission grants"