Merge branch 'manojmj-master-patch-71254' into 'master'

Scope feature flag to user

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



Merged-by: Imre Farkas <ifarkas@gitlab.com>
Approved-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Manoj M J <mmj@gitlab.com>