Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev