[SettingsPage] Misc Fixes GitOrigin-RevId: 56f58d2bb5830f7e0584a83c98efc9989ae2bd42
[SettingsPage] Integration Branch GitOrigin-RevId: 5a3c26b2a02d716c4ae3981e3f08b811ae307725