Merge "[flexiglass] Fixes bouncer layout on foldables" into main