Update forms for using the new FormStateInterface methods
Update FormBuilderWrapper service arguments for issue #2228093