Settings tweak backport#6488

deepthi merged 2 commits intovitessio:release-7.0vitessio/vitess:release-7.0from

planetscale:settings-tweak-backportplanetscale/vitess:settings-tweak-backportCopy head branch name to clipboard