Merge "Release the scratch pbuffer surface after use"