chore: rebase 2u-main with master

[awais-ansari]

Description

Include a description of your changes here, along with a link to any relevant Jira tickets and/or GitHub issues.

How Has This Been Tested?

Please describe in detail how you tested your changes.

Screenshots/sandbox (optional):

Include a link to the sandbox for design changes or screenshot for before and after. Remove this section if it's not applicable.

Before	After

Merge Checklist

• [ ] If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Sandbox, if applicable.
• [ ] Is there adequate test coverage for your changes?

Post-merge Checklist

• [ ] Deploy the changes to prod after verifying on stage or ask @openedx/edx-infinity to do it.
• [ ] 🎉 🙌 Celebrate! Thanks for your contribution.

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 76.47059% with 4 lines in your changes missing coverage. Please review.

Project coverage is 58.70%. Comparing base (c31e164) to head (dbb3748).

Files with missing lines	Patch %	Lines
src/account-settings/AccountSettingsPage.jsx	73.33%	4 Missing :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #1134 +/- ## ========================================== + Coverage 58.61% 58.70% +0.09% ========================================== Files 117 117 Lines 2317 2332 +15 Branches 641 648 +7 ========================================== + Hits 1358 1369 +11 - Misses 898 902 +4 Partials 61 61 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.