Merge branch 'jy-issue-425473' into 'master'

Experiment settings also govern Beta features

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133286



Merged-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Approved-by: Madelein van Niekerk <mvanniekerk@gitlab.com>
Co-authored-by: Jessie Young <jessieyoung@gitlab.com>