Merge branch 'fix-batched-diffs-view-switch-flaky-test' into 'master'

Fix flaky test: use fresh merge request per context

Closes gitlab-org/quality/test-failure-issues#7034

See merge request !211363



Merged-by: Sincheol (David) Kim <dkim@gitlab.com>
Approved-by: Sincheol (David) Kim <dkim@gitlab.com>
Co-authored-by: Marc Shaw <mshaw@gitlab.com>