#3540209: Remove toolbar dependency.

Closes #3540209

Merge request reports

Loading