Merge "[flexiglass] Make sure scene and userActions are in-sync" into main