am c31dd3f3: Fix Surface leak Bug #6452240

* commit 'c31dd3f30d02758747a40da1057a326b8bc0e01e':
  Fix Surface leak Bug #6452240