Split out Surface
from Window
#3942
Open
Loading
Surface
from Window
#3942