Flow height incorrect when more than 3 rows in version 2.1.0

[M66B]

This worked fine in version 2.0.4

Simplified layout:

androidx.constraintlayout.helper.widget.Flow (with a number of image buttons, attached to an "anchor" image button at the start and end)

androidx.constraintlayout.widget.Barrier (direction bottom, referencing the start/end "anchor" buttons and the flow in between)

TextView (below the barrier)

The TextView overlaps the forth row. It works fine with 1, 2 or 3 rows.

The used layout file can be found here:

https://github.com/M66B/FairEmail/blob/master/app/src/main/res/layout/include_message_navigation.xml

Edit: the barrier is causing the problem.