Update from main (production)

[github-actions]

This is an automated pull request to update from branch main

[github-actions]

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	302
Summary	Adds 1 new conflicts. How can we do better?

Comparing with	master
Benchmark conflicts with prod	350
Current conflicts	352
Summary	Adds 2 new conflicts. How can we do better?

New conflicting files with 'master'

common/static/css/vendor/images/treeview-default-line.gif
common/static/css/vendor/images/treeview-default.gif
common/static/css/vendor/indicator.gif
common/static/css/vendor/jquery.autocomplete.css
common/static/css/vendor/jquery.treeview.css

[github-actions]

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	302
Summary	Adds 1 new conflicts. How can we do better?

Comparing with	master
Benchmark conflicts with prod	350
Current conflicts	352
Summary	Adds 2 new conflicts. How can we do better?

New conflicting files with 'master'

common/static/css/vendor/images/treeview-default-line.gif
common/static/css/vendor/images/treeview-default.gif
common/static/css/vendor/indicator.gif
common/static/css/vendor/jquery.autocomplete.css
common/static/css/vendor/jquery.treeview.css