Merge branch 'eread/combine-stash-information-with-add-and-make-changes-information' into 'master'

Combine stash information with add and make changes information

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



Merged-by: Phillip Wells <pwells@gitlab.com>
Approved-by: Phillip Wells <pwells@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>