[SettingsPage] Small Fixes 2 GitOrigin-RevId: fe29b5a97cac4e92f6458e2359569d6c080b626b
[SettingsPage] Integration Branch GitOrigin-RevId: 5a3c26b2a02d716c4ae3981e3f08b811ae307725