Merge "[flexiglass] Update scene check to use SceneResolvers" into main