Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state' into 'master'

Resolve "Searchable settings puts expand/collapse toggle in an invalid state."

Closes #35955, #37520, and #39207

See merge request gitlab-org/gitlab-ce!13363