Merge "[flexiglass] Fix transition check unintentionally removed in ag/29690011" into main