Backports changes made to One notification per code review See merge request gitlab-org/gitlab-ce!23656