am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

* commit 'ca84c8b1b0e364e01ce392f0dbca5132830a148d':
  Revert "Force-use the pbuffer surface for destroy"