Merge "Clean up starting window to prepare for saved surfaces"