Toolbar: Demo persistent toolbar active state fix

Fixes gh-7578
Closes gh-7584