Weapon Swap not working with Disciple of Varashta's Command Skills

As a Disciple of Varashta, if you assign one of the Djinn command skills to, for example, weapon set 1 and not 2, while using weapon set 2 the icons for the command skills are grayed out and unable to be used and no weapon swap is possible. In my testing I used 2 different wands in weapon set 1 and 2.

This is also true while shapeshifted if you assign the Djinn command skills to your wand (for example) and not your talisman. Is it possible this is related to the recent change allowing players to stay shapeshifted while using command skills?