Update from `main` (production)

[github-actions[bot]]

This is an automated pull request to update from branch main

[github-actions[bot]]

Checking git merge conflicts against https://github.com/openedx/edx-platform.git

Comparing with	open-release/nutmeg.master
Benchmark conflicts with prod	301
Current conflicts	301
Summary	Good work! No added conflicts.

New conflicting files with 'open-release/nutmeg.master'

``` lms/static/sass/shared-v2/_base.scss ```

Comparing with	master
Benchmark conflicts with prod	331
Current conflicts	331
Summary	Good work! No added conflicts.

New conflicting files with 'master'

``` lms/static/sass/shared-v2/_base.scss ```