Merge "Prevent addtional removeSurface calls" into sc-dev