fix: Hanging protocol state fixes (#3242)

* fix: Some residual issues with hanging protocol after state sync

fix: Some issues introduced by the state syncing changes

* fix: PR fixes, mostly code cleanup

* Improve a race condition in an automated test

* Remove obsolete code

* PR fixes

extensions/default/src/commandsModule.ts

@@ -153,8 +153,8 @@ const commandsModule = ({ servicesManager, commandsManager }) => {
         const restoreProtocol = !!viewportGridStore[storedHanging];
 
         if (
-          protocolId === hpInfo.hangingProtocolId &&
-          useStageIdx === hpInfo.stageIdx &&
+          protocolId === hpInfo.protocolId &&
+          useStageIdx === hpInfo.stageIndex &&
           !activeStudyUID
         ) {
           // Clear the HP setting to reset them

extensions/default/src/utils/reuseCachedLayouts.ts

@@ -58,7 +58,7 @@ const reuseCachedLayout = (
       }
       if (displaySetOptions[i]?.id) {
         displaySetSelectorMap[
-          `${activeStudyUID}: ${displaySetOptions[i].id}: ${displaySetOptions[i]
+          `${activeStudyUID}:${displaySetOptions[i].id}:${displaySetOptions[i]
             .matchedDisplaySetsIndex || 0}`
         ] = displaySetUID;
       }