Merge "Modify parameters of CreateNativeSurface()" into devel/master