Merge "Use correct validator for SELECTED_SPELL_CHECKER_SUBTYPE"