Few days ago i found a way to fight with this bug. I keybinded my templates (equip and build) to NUM buttons and when i change my builds with keybind i just press it few times in a row and utilities swapping to where they have been before. It works all the time so this bug is fixed for me personally.