Fix heading updating in toolbar plugin
Merge branch 'oerpub-heading-plugin' into testing
Revert some things from first attempt to fix heading issue.