Merge "[flexiglass] Change instantCollapseShade to use snapToScene" into main