Skills resetting and being removed from bar on Xbox Series X

I have a Shaman setup with Pinnacle of Power, and Ice Storm, among other skills and every time i enter a new area these 2 skills are changed on my bar, forcing me to rebind them every time.

I am on Xbox and my Pinnacle of power is set to LB and Ice Storm is set to Y, when i enter a new area such as a new map or enter the Temple, the Ice storm gets moved to LB and Pinnacle of power is removed from my bar.

I dont believe this was happening pre patch but cant be sure as i have just finished putting this built together and this is very annoying and time consuming to change in every instance i enter

So I went to my PC to test the same thing there and get the exact same issue with those 2 skills being removed from my bar when I change zones.

Any update on if this is being looked into or fixed in the next patch? Kinda breaks the build if I have to keep re organizing my bar every time I enter a zone