Fixes #3727 - intermittent exception in UpdateStateIcons
Merge branch 'master' into orion-war

* master:
  Fixes #3727 - intermittent exception in UpdateStateIcons