Merge "Make started/finished states SharedFlows." into main