Merge "Reapply "Handle queued state for progress messages"" into main