LPS-35434 fix bugs introduced with alloy toolbar migration

cc @eduardolundgren