Merge "screenshots can now go into a Surface from java" into jb-mr2-dev