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

* commit 'c054d414eeafd5ba226c743626b9a7139bda9425':
  Avoid leaking Surface native object.