Merge "Validate user-supplied tree URIs in DocumentsProvider calls"