Merge "[flexiglass] Patch for the unfurl animation" into main