Merge "return file uri from downloadmanager instead of content uri for public downloads"