Re-add skip error boundaries flag and change

[bvaughn]

Revert PR #20147 once reconciler fork settles.

[bvaughn]

Whoops I guess I had already created a task for this with a slightly different title.

#20198