layers/app: properly remove surfs, deactivate main_surface