PR #9729 review: workspace move state fixes