Merge "Fix new Expandable animation lag" into main