Merge "Refactored SurfaceMediaSource"