Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-dev