Merge "Handle MediaProvider#query exception"