Merge "Fix a bug that effectively disallows hiding surfaces."