[SettingsPage] Small Fixes 3 GitOrigin-RevId: 98accb3c53c802e83f2939e5c25d13fcf3b5e054
[SettingsPage] Integration Branch GitOrigin-RevId: 5a3c26b2a02d716c4ae3981e3f08b811ae307725