Issue #3413484 by kriboogh: Make overrides work on core block displays instead of using an alternative display. Refactor the overrides into plugins.
Closes #3413484