Merge "[flexiglass] Switch to Gone during LS transition" into main