am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev

* commit '99ba72039d9d97ea3ed7d01b327b98c87051e989':
  Avoid leaking Surface native object.