Merge "GraphicBufferSource fixes" into jb-mr2-dev