Merge "Add extra headers specified in the media player's setDataSource call"