Merge "Update topology when display removed" into main