App: correctly deactivate sub surfaces