Merge "Skip dumping surface control if it's already removed" into main