Merge "fix CloseGuard usage in Surface" into jb-mr2-dev