Surface(No)View Bug

Duplicate of #132047.