Merge "[flexiglass] Fix HUN animation on Shade scene" into main