Merge "Remove RenderSurface from Core" into devel/master