desktop: Allow desktop_api to handle surface removal