Hello,
Personally I consider normal to have this bit be changed automatically.
When the MCU goes into STOP mode, the PLL is switched off and not able to provide a clock.
During wake up, the PLL clock may not be appropriate, so you can run the device on the oscillator with a known frequency or on the Self Clock Mode.
Is Processor Expert looking at this post and able to comment on their implementation ?
Alban.