Merge "Remove SubtypeSwitcher"