Merge "Support prefix in SubtypeSwitchingController#dump()" into main