Merge "Switch to pbuffer surface sooner" into nyc-dev