Merge "improve SurfaceControl.screenshot documentation" into jb-mr2-dev