Merge "Split view::Surface out of Surface.cpp"