fix #8694: apply tooltip demo ordering change from #8730 to popovers too