Merge "Fix crash when DocumentsProviders using duplicate authority exist" into pi-dev