Merge "Properly close Surface when done." into jb-mr2-dev