Merge "[flexiglass] Fix split shade loading" into main