Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev