Merge "Add GetSurfaceType() in TestRenderSurface" into devel/master