Toolbar: Stop using deprecated event in fixed persistent demo

Closes gh-7200
Fixes gh-7085