Merge "Revert "Move all flows to the background dispatcher"" into main