"Add another item" button is shown for a field with original ulimited cardinality but limited cardinality defined using this module

Patch for people not comfortable with MR workflow.

Updated patch

I took a look and this seems to make sense to me. I'll do some testing, and would welcome anyone else's feedback as well.

Updated patch

I did a test setting the "Allowed number of values" to unlimited in the field storage settings and set the cardinality limited to 4.
In the entity form, Drupal was displaying 2 fields and the 'Add another item' button before this patch was applied.
Once this patch is applied, I can see the 4 fields displayed.