Merge "Fix calculation of the collapsible height" into rvc-dev