Merge pull request #2166 from kotborealis/fix/workspace-soft-reset-persistence _stream: Persist soft workspace resets