Merge "allow mediaprovider to use media extractor" into pi-dev