Issue #3314353 by immaculatexavier, dpi: EntityTestRev has duplicate view_builder annotation entries (cherry picked from commit 054e05d0)