[Bug 842213] Change shortcuts to use canvas instead of elements [c=crdlc]
Merge pull request #8236 from EverythingMe/shortcuts-to-canvas

[Bug 842213] Change shortcuts to use canvas instead of elements [c=crdlc]