Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master'

Resolve "MR refactor: parallel and diff view are being rendered at the same time"

Closes #48897

See merge request gitlab-org/gitlab-ce!20440