chore: cherry-pick some inj changes (backport #17109)

[mergify]

This is an automatic backport of pull request #17109 done by Mergify.
Cherry-pick of 5442197 has failed:

On branch mergify/bp/release/v0.50.x/pr-17109
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 5442197d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   client/flags/flags.go
	modified:   client/keys/add.go
	modified:   math/int.go
	modified:   simapp/simd/cmd/testnet.go
	modified:   x/gov/README.md
	modified:   x/gov/keeper/keeper.go
	modified:   x/gov/keeper/msg_server_test.go
	modified:   x/gov/keeper/proposal.go
	modified:   x/gov/types/errors.go
	modified:   x/group/keeper/msg_server.go
	modified:   x/group/keeper/msg_server_test.go
	modified:   x/staking/keeper/msg_server.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   math/CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com