fix(hp): When reapplying an hp the display set selectors should be considered. (#5074)

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>

extensions/default/src/commandsModule.ts

@@ -395,6 +395,7 @@ const commandsModule = ({
           hangingProtocolService.setProtocol(protocolId, {
             stageId,
             stageIndex: useStageIdx,
+            displaySetSelectorMap,
           });
         } else {
           hangingProtocolService.setProtocol(protocolId, {

extensions/default/src/utils/reuseCachedLayouts.ts

@@ -61,7 +61,8 @@ const reuseCachedLayout = (state, hangingProtocolService: HangingProtocolService
       if (viewportId === activeViewportId && i === 0) {
         setDisplaySetSelector(`${activeStudyUID}:activeDisplaySet:0`, displaySetUID);
       }
-      if (displaySetOptions[i]?.id) {
+      // The activeDisplaySet selector should only be set once (i.e. for the actual active display set)
+      if (displaySetOptions[i]?.id && displaySetOptions[i].id !== 'activeDisplaySet') {
         setDisplaySetSelector(
           `${activeStudyUID}:${displaySetOptions[i].id}:${
             displaySetOptions[i].matchedDisplaySetsIndex || 0