Merge "Fixing bug in SurfaceMediaSource_test"