Merge "[flexiglass] Remove layoutMinHeight uses" into main