Merge "[Flexiglass] Fix split shade layout and transitions" into main