Merge "[flexiglass] Fix compose crash when QS height hoes negative" into main