Merge "[flexiglass] Avoid extra recomposition in pattern bouncer." into main