Merge "Move Surface operations out of WindowState."