Merge "Fix drag and drop in Files app."