Merge "[SimsUiEnhancement] The primary SIMs ListPreference's items show number" into main