Merge "[flexiglass] Scene container no longer visible after canceled swipe." into main