Merge "Avoid leaking Surface native object." into jb-mr2-dev