am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit 'c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)