#2643: Standardize includes of toolbar layout

[domdomegg]

Description (required)

Works on #2643

Include toolbar.xml in the same simple way everywhere - there is no need to add the id, width, height etc. in both the caller and the template - it should just be once in the template. There are a couple of unused files which I haven't updated but these should be deleted by #2641 and I don't want to create merge conflicts.

Tests performed (required)

Tested 2.10.1-debug-refactor-toolbar~9d15e177e

Beta Commons upload

[codecov-io]

Codecov Report

Merging #2646 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #2646   +/-   ##
======================================
  Coverage    2.77%   2.77%           
======================================
  Files         259     259           
  Lines       12373   12373           
  Branches     1117    1117           
======================================
  Hits          343     343           
  Misses      12003   12003           
  Partials       27      27

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 31c6888...9d15e17. Read the comment docs.

[neslihanturan]

Thanks for improving the code quality @domdomegg