Merge "Move surface save state tracking to WindowState."