Merge "Prevent multiple competing dismissals." into main