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