Merge "[flexiglass] Animate scrim to default position when stack height changes" into main