Shader Instance Combobox reports incorrect Shader Instance after exiting debug render modes

In Painter 11.0.1 I'm experiencing a bug where the UI is updating incorrectly. 

If you have a scene with multiple shader instances in it and have a textureset active using a shader instance that is not the first one in the combobox there is a problem. 

If you switch to a debug shader in the viewport (like "Normals"), the Shader Instance widget will go blank, showing that no shader from the scene is currently used on the textureset.  When you set the debug mode back to "Material" the expected behavior is that it returns to the original Shader Instance that is assigned to the current textureset.  However what actually happens is that the widget updates to just show the first shader instance in the combobox list.  It doesn't actually break shader instance assignment, but the UI does not match what is actually assigned to the textureset.

This is causing some serious problems for us as we have a tool that watches the contents of this widget to update our custom UI when the user manually assigns a new shader to a textureset.  That code is being executed every time we come out of debug shader modes and causing serious slowdown in our user experience.