Merge "Update SpellCheckerPreference layout to support divider" into main