Merge "[flexiglass] Remove extra spacer under QQS" into main