Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"